Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 13 Jul 2010 22:45:58 +0000 (22:45 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 13 Jul 2010 22:45:58 +0000 (22:45 +0000)

Trivial merge